[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: ca058eac -s ours

am skip reason: skipped by user dupin

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

Change-Id: I124cdcdeecd934ab31356a80ec017814a00ad209