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

Change-Id: I1e5d18e31479410b321041ea4b146337660f302c