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

am skip reason: Merged-In I35c539bdcdb0934bd1efcce89f219f57fbd79bb5 with SHA-1 131aa921e4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/27274116

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