tree 24b1c9edf40ccc41c1dd793f3c2ad9dff7c25534
parent 423bdcf9a399d5232cfd2821dcd28f1ab54b6277
parent 7ba67896209001665f7f37b3111c21fa7e834172
author Matt Pietal <mpietal@google.com> 1669899842 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1669899842 +0000

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

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

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