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

am skip reason: Merged-In Ib851a4cb2332902f4c96eec5131eb7d5aff99dd5 with SHA-1 983d5d50 is already in history

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



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