[automerger skipped] Merge UQ1A.231205.015 am: 30a2b10bc5 -s ours am: c610a25bff -s ours

am skip reason: Merged-In I78489684eec5f4637a447fc2cdb9ca390eb71f63 with SHA-1 9fbf9dbaf3 is already in history

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

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