[automerger skipped] Fix CarServicesTest. am: 9d3a0be7ec -s ours

am skip reason: Change-Id I4aa08b93252f4b494f4fdee1049847c0bb7ec779 with SHA-1 23fbfa26ca is in history

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

Change-Id: I9d4db37497d4ff6370673f5fd40b3a4ad0f1fffc
tree: 64a8f66c90782cfd967c4978cc94f22b5445a9b7
  1. Android.bp
  2. OWNERS
  3. PREUPLOAD.cfg
  4. src/
  5. tests/