[automerger skipped] Update color-check-baseline.xml am: 796fcccd -s ours am: 6f478f1a -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: I3059f4c5bb13108c00abfe3844e45739312ba155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>