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 am: 6245113a am: 29a966e9

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



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