[automerger skipped] Merge ab/7061308 into stage. am: 375ca5eb44 -s ours

am skip reason: Change-Id I80b208fcfa00d568cca58caa23071eeac7736eb6 with SHA-1 083fb5f8be is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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