[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to...

[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 59687818 -s ours

am skip reason: Merged-In I8d975b81afd2cde1d543e8bc7e730a6e42393bec with SHA-1 787d302b is already in history

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



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