[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e595fd650a -s ours am: 2ffab078e5 -s ours

am skip reason: Merged-In I1ab0e42437ef8c2acdf7e93863c21197b4731e5f with SHA-1 a364928354 is already in history

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

Change-Id: I9fb7f69fe157b477c8cd3b70b2ecb60c0617c9b7