[automerger skipped] Merge Android 12 am: 1c77a89a -s ours am: 77cb9c4c -s ours am: 8d2a5eb1 -s ours am: 31404fdd -s ours

am skip reason: Merged-In I6e16664c4e339adb76f30f27a44a2d85ea07f24d with SHA-1 76b73572 is already in history

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

Change-Id: I25957edb78876d82d1ff2dfc900d52ad7d8bf50c