[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to...

[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 2e74dfde -s ours

am skip reason: Merged-In I20b3d485a00109060a6ed206503aa3c12c812969 with SHA-1 fa74cd76 is already in history

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



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