[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: de53d965 -s ours

am skip reason: Merged-In Ic2ffd5a1f4420121b958cadb726c3e805cda1434 with SHA-1 2c006d11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30285488



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