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

am skip reason: Merged-In Ib257fd390b7d1442bc453e425d338a1a986f6e8d with SHA-1 5e87b0d4ff is already in history

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

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