[automerger skipped] Merge 24Q3 to AOSP main am: 6f4fcdf6 -s ours am: 4b64097d -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: Id6f86d1afcddea5679b9c3d326635858799b89bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>