[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: 7f80af61 -s ours

am skip reason: Merged-In I02e87e92878770cf21fb5032efb75eb1b222c62f with SHA-1 df5bd53d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27555602



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