[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 952d16a9 -s ours

am skip reason: Merged-In Ic436003390c8feb4c5e9a36106abc1f7ab7f5a46 with SHA-1 077343ad is already in history

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



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