[automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future am: 5c8edcf937 -s ours

am skip reason: Merged-In I4c24aae97ef052f6385281dd6e73f748d880decb with SHA-1 ff206d6d5d is already in history

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

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