[automerger skipped] Merge "Revealing the light reveal scrim only during keyguard exit animation" into sc-dev am: 5837f7b41b am: bc49f4f85a -s ours am: 98e9150431 -s ours

am skip reason: Merged-In I5180ec48e6e100832741273277ac9d2ff4c289b0 with SHA-1 9eda54b15e is already in history

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

Change-Id: Ie07793af799aaa43ca1325a2307ed297680407db