[automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev...

[automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf7 -s ours am: 2600b1bb -s ours

am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808



Change-Id: Id167b7cda9295904f5f8aa173bacaeb7175a9b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>