[automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future" into aosp-main-future am: 4e60956634 -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: I42483825ca6dca36cf79e31584d2d63dcfed5c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>