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

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

Change-Id: Ic95d4d7dc74aa4dbbac7a8ffdcb71a9bb6ef55e0