Merge "Revealing the light reveal scrim only during keyguard exit animation" into sc-dev am: 5837f7b41b

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

Change-Id: I0984f9ecf94a16ceb07c97a81d494b9e10df7549