[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e595fd650a -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: I6fb5e704cf194c5429e762ff6099fcbf4b404fe4