[automerger skipped] Merge Android 12 am: 4ff5a633fe -s ours am: 1bccb5edef -s ours am: a6f0b2bb54 -s ours

am skip reason: Merged-In I7452a5f39d9b55361153edf7919c59de59c8656c with SHA-1 3d90e911fd is already in history

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

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