[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d7c74a4489 -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: I382146b91d8b43915d6f5e3eed356ab4453b1d6f
tree: 03cad8be77789d40d2ed0f98eacb2929afea8459
  1. Android.bp
  2. OWNERS
  3. PREUPLOAD.cfg
  4. src/
  5. tests/