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

am skip reason: Merged-In Ie5d5e5b1216deeefc72435bcd772344a126377c9 with SHA-1 068d444f8b is already in history

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

Change-Id: I179f5fa7f27fd3f7fde9f171ea88afb72cefd9e1
Signed-off-by: Automerger Merge Worker <[email protected]>