[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 801d339361 -s ours am: 75f61b59c5 -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: I239c72123ac55181368d71c5eb82e0ef135e7190
tree: 99a6f20963d7d89d8fd066d42841932fd0a0f7e9
  1. .gitignore
  2. OWNERS
  3. PREUPLOAD.cfg
  4. library/
  5. tools/