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

am skip reason: Change-Id I7daff7a14170cc8d033b8fac71b52f825d87287c with SHA-1 d6946cb52e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/services/+/12470041

Change-Id: If50e36bfd6083437878369e3353abd3453669d68
tree: e67c2f26c6603f0ee5e8762a5a624a9ab089e94c
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg