Merge "Add some ways to detect color bars." into stage-aosp-pi-cts-dev am: 0f367bdf77
am: c0e5601cf7

Change-Id: I62ca4b5e1c1c0417bdd6e38879925340a6e3c989