[automerger skipped] Merge Android R am: 19f9fc18c9 -s ours am: ba660c4ec7 -s ours

am skip reason: Change-Id I4e01fbf5d6fd342573625b6e3ad0c2a387432920 with SHA-1 801d339361 is in history

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

Change-Id: If39c493093e746b7bb1c49d24b6510f47c578e45
tree: 99a6f20963d7d89d8fd066d42841932fd0a0f7e9
  1. .gitignore
  2. OWNERS
  3. PREUPLOAD.cfg
  4. library/
  5. tools/