[automerger skipped] Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future am: 57f907ae -s ours

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

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



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