[automerger skipped] Merge Android R am: b68ac114f8 -s ours am: 835efccc5e -s ours am: dbab1c4429 -s ours am: ffcc767562 -s ours

am skip reason: Change-Id I11c4aae11395a7bf8f92574af746f7af3687a216 with SHA-1 f48ff0ad05 is in history

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

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