[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d7c74a4489 -s ours am: 7b9f174913 -s ours

am skip reason: Change-Id Ief0b528a34274650bb350836ed0f2385a202cb83 with SHA-1 ba8043e499 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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