[automerger skipped] Merge 10952656 am: a00b686adb -s ours am: a532f9e3bd -s ours

am skip reason: Merged-In I7c0a2e59a88effd96b76df0ce24e1910bc2df5af with SHA-1 2f700bd30d is already in history

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

Change-Id: I23a19c1d98c8f868635797e43fa4be87295e0283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: b8f4d687cf9e73ebaf19778adbef51901694b898
  1. builtInServices/
  2. tools/
  3. updatableServices/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg