Merge "[automerger skipped] Merge "DO NOT MERGE: Add some ways to detect color bars." into oreo-mr1-cts-dev am: c2885e3c2e  -s ours" into pie-cts-dev