[automerger skipped] Merge Android 12L am: 421d783b26 -s ours am: 2aa9351a0e -s ours

am skip reason: Merged-In Icfc14be2b731e4958e090bb935807ee414076b7f with SHA-1 6a54988343 is already in history

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

Change-Id: I0aaedd8032d383d0bd83fdcc18573b11589ee45e