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

am skip reason: Change-Id I30a2a3f5af794eaeaea2facee92e8a1dc196a249 with SHA-1 e492e57ef2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/wilhelm/+/12470173

Change-Id: Ie5ab97d670d22fb452f6026fe2842aef4a583526
tree: 637d93c8c6439990697bb2f6724b8edbd26e022b
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS