[automerger skipped] Merge Android 13 QPR2 am: 918a28eb91 -s ours am: 2e3fcecf12 -s ours am: 8fde294d5f -s ours am: d27cc87c8a -s ours

am skip reason: Merged-In I4c7299077b97443e0db1675b800a546949dff1e8 with SHA-1 1c1f3be1de is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/2487196

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