tree 5fd5c721d9af1ea549c5660074ed5324546ff2a5
parent 3798f613162272528bb96f80513ec436f316faad
parent b9acabe9f84a816e914470ddf44c07298eeec32b
author Xin Li <delphij@google.com> 1639520336 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639520336 +0000

[automerger skipped] Merge Android 12 QPR1 am: 9f9280f2e6 -s ours am: 6d932bc9c1 -s ours am: e05bdc2d38 -s ours am: b9acabe9f8 -s ours

am skip reason: Merged-In Id5bc2eca540bc13ab44c52cda5bf2e637614ae59 with SHA-1 7eb2ea9a58 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/1921937

Change-Id: Ic57d0a16c5ef74519c03b56cf46e28b517eb0850