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

[automerger skipped] Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future am: 17a071f2 -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: I0ff1d3c8c1c43440dc9d1a1f4a0996254a0ff44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>