[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: 92e5907f -s ours am: edc962f2 -s ours

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

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



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