[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 9e2b7eff -s ours

am skip reason: Merged-In I92230d0574f58970aa32bb7c5d493af32dc1b40f with SHA-1 4d3041a1 is already in history

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



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