Also, standardize on a set of possible modes for the displays to enter and separate the configuration of the color mode from the configuration of the display mode. Bug: 29044347 Change-Id: I6af0a7d1f11bc72d4cefc380f115c1fb00788864
And start using them in other non-macrobench tests Change-Id: If155b531f3c89f97491001c06d1996df527b9f85