[automerger skipped] Merge "DO NOT MERGE: Add some ways to detect color bars."...
[automerger skipped] Merge "DO NOT MERGE: Add some ways to detect color bars." into oreo-mr1-cts-dev am: c2885e3c -s ours
am: 764c8a06 -s ours
Change-Id: I62e992af9a66117b4b982a15cc70fe904cf7a8bc