[automerger skipped] Merge 24Q4 into AOSP main am: cab60395bd -s ours

am skip reason: Merged-In I1d7baa7027f263a66063f3453e4ebab807652a63 with SHA-1 dd7d31f4e7 is already in history

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

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