Merge "[automerger skipped] Merge Android 13 QPR1 am: 3545d962 -s ours" into stage-aosp-master am: 6987218c -s ours

am skip reason: Merged-In Ibdc81d3c99358238ccc5178a92fb6651f00c4362 with SHA-1 205e479a is already in history

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



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