[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6eed90606d -s ours am: f9b2fb8b4f -s ours am: 54271f3822 -s ours

am skip reason: Merged-In Ie5ca5b7a60339ae8cdebc67ba4d44218ad7f071e with SHA-1 5518300208 is already in history

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

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