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