[automerger skipped] Merge "Update color-check-baseline.xml" am: 81cb8a2612  -s ours
am: 3461bd0644  -s ours

Change-Id: I6e510de1b75e2656e4f82727e2a9911f3e32d8d7