[automerger skipped] Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future am: 7cdd0024 -s ours

am skip reason: Merged-In I40d73e79075893826492b85c27e35eed59b4b289 with SHA-1 bda5236d is already in history

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



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