Merge "Revealing the light reveal scrim only during keyguard exit animation"...

Merge "Revealing the light reveal scrim only during keyguard exit animation" into sc-v2-dev am: f5f87aa3 am: a7a6e8ad

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

Change-Id: I2368ad5f6a18c541a035ed983e341494e120b459