[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to...

[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: 2389748d -s ours

am skip reason: Merged-In I713a528d437e3446d32461add648e3b52b036d7a with SHA-1 61b282a9 is already in history

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



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