[automerger skipped] Merge Android 12 am: 1bdd18355e -s ours am: 51d86f2726 -s ours

am skip reason: Merged-In I38da9f192d57688b1b05bb2bf41ce33f87a60807 with SHA-1 e595fd650a is already in history

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

Change-Id: Icc1e422b3ad9658d06511be5f5aa3965c4844cbe