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

am skip reason: Merged-In Ibe9b06e590ed420f29c790188dee11674fca5a2e with SHA-1 68e90f1b4e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3258441

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