[automerger skipped] Merge RQ2A.210305.007 am: 37fe041479 -s ours am: f960f88a84 -s ours

am skip reason: Change-Id I141efeec319cdf0c74317a70cfec936472290d19 with SHA-1 bcdb7abac4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cd5927c15c4dfe3817e482d23b1c07cd5bbb8d4
tree: 834f2ceb7501031f38e112507e12ebad8bd80be6
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg