[automerger skipped] Merge "Change behind-scrim's tint in BOUNCER state to...

[automerger skipped] Merge "Change behind-scrim's tint in BOUNCER state to match GM3 surface color." into udc-dev am: 2ac80135 am: a5e3155a -s ours am: df505443 -s ours am: f5c1eaa6 -s ours

am skip reason: Merged-In I67149c6faa2766be6d2537f2315dd2734bdd0447 with SHA-1 83b55b6a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24034687



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