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

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



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