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

am skip reason: Merged-In I636eeec062801eba81cc123787430aaa8eb72f2c with SHA-1 51d4c66294 is already in history

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

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