Merge "Fix keyguard -> shade_locked scrim transition" into tm-qpr-dev am: 7ba67896 am: 77d5e962

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



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