[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: 7b1f850c -s ours

am skip reason: Merged-In I3d210caa7b15c24eaf523207e4905b20a2894260 with SHA-1 497f718c is already in history

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



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