[automerger skipped] Merge Android 12L am: 9c884149 -s ours am: db6f32db -s ours am: 1ae90433 -s ours

am skip reason: Merged-In I146a7e642778aa3c5c5c8f0b7f03535de5d9a814 with SHA-1 820707d6 is already in history

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

Change-Id: I9efda1237dd428e098b4311439dd0035a571acce