[automerger skipped] Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: edd650f6b5 -s ours am: becaef984f -s ours
am skip reason: Merged-In I7b7a3e1b6d72709acbae0a0433af897a28d73afc with SHA-1 8dec2efc67 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403
Change-Id: Idb166e75d42cea5c1e7b73e7b8fb88d274323c2c
This commit is contained in: