[automerger skipped] Merge Android 13 QPR2 am: d95bc01978 -s ours am: d0eacf40de -s ours am: 582d32f0e7 -s ours am: 19fd46b2c6 -s ours

am skip reason: Merged-In I7f0df766ce3e1025421252bf1c986c4d403e0a1f with SHA-1 ff1efb9d28 is already in history

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

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