Merge "[automerger skipped] Merge Android 13 QPR1 am: 391e92ba41 -s ours" into stage-aosp-master am: 0ad409f84a -s ours

am skip reason: Merged-In I91060901a090bb53ce52654436ebf3445e53118d with SHA-1 6ab057927f is already in history

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

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