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

am skip reason: Merged-In I79098b8d7793718a19dfbde161f1ab35d5f2d95b with SHA-1 df2d4de85b is already in history

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

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