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