[automerger skipped] Update color-check-baseline.xml am: 796fcccd9b
-s ours am: 6f478f1a6b
-s ours am: dba1c83ed4
-s ours am: 1ef86aaa54
-s ours
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: I2d7afa711558b6ef268864ff1a44e43724273946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: