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: f0c8f987

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



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