[automerger skipped] Merge "Revealing the light reveal scrim only during...

[automerger skipped] Merge "Revealing the light reveal scrim only during keyguard exit animation" into sc-dev am: 5837f7b4 am: bc49f4f8 -s ours am: 278b2716 -s ours

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

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

Change-Id: I7162f4b7fb34687c73868da27c6e6079ff9e4b8a