[automerger skipped] Merge Android 12 QPR1 am: 9f9280f2 -s ours am: 6d932bc9 -s ours am: e05bdc2d -s ours

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

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

Change-Id: Ia67c7ac9644958d0473fc1d5992ec69a16b1a80d