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

[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 8a31520e -s ours

am skip reason: Merged-In I4a6dd1c5e48db7085ea41035def31f0844948a46 with SHA-1 2150160d is already in history

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



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