[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 4c7fc9cc39 -s ours

am skip reason: Merged-In I9c901f0320483c6125caac3c0e5886ba46a442ed with SHA-1 f00eb03373 is already in history

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

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