[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 801d339361 -s ours

am skip reason: Change-Id I3a6d30448b2248807a5edf579f72bb6ed885b75e with SHA-1 8d2737e20a is in history

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

Change-Id: Idc95c9ff8ce5fdb457435e55f40b50443a019f02