Merge "[Keyguard] Remove behind scrim for alarm" into tm-qpr-dev am: 2ae06d9b am: bffcd18a

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



Change-Id: If303cbcd148ee68f48f24486208a4ecb06a320c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>