[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 48483108d9 -s ours am: 2adc3ad364 -s ours

am skip reason: Merged-In Ieaa9dcd168d0b52866ced42585986f1b33d611e0 with SHA-1 d198d8ea75 is already in history

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

Change-Id: I26e1cb1dcbf7f9f1353bd4a768f155385a069585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>