[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6a54988343 -s ours am: 28770ab49b -s ours

am skip reason: Merged-In I2017c021e6baf200ad718eb661010eba56cdf39d with SHA-1 f8c3b3f5d8 is already in history

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

Change-Id: Ieb131519866eea2e30a912af541018d6b81a7f46