[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: 67d97cd7 -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: I04ef6fea70711f87cc0368b01b0839ed6f52bc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>