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

am skip reason: Merged-In Ic98f71c1735664230cedbe76e1d77c8e5cabbbf7 with SHA-1 b6d9e11ad3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/sdk/+/27274147

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