Merge "Ensure light reveal scrim is fully revealed once we're unlocked." into...

Merge "Ensure light reveal scrim is fully revealed once we're unlocked." into tm-dev am: 9c8a68c3 am: 2502c4a3 am: 75ac093e am: d24979d1

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



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