[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3d90e911fd -s ours am: 97bb29df3d -s ours

am skip reason: Merged-In I1dcb9494598cdbdcdfe31cb78396f6e817768e55 with SHA-1 cb5263a3a1 is already in history

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

Change-Id: Ie067a98f2dfff408f6ffae35ecd7c8e159b088eb
tree: 25b75eb6f8866a57e23f4b4eadc8121e71e9fd60
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg