[automerger skipped] Merge QQ3A.200605.002 into master am: e01e933a67 -s ours am: 57450c2252 -s ours

am skip reason: Change-Id Idbb54a5542a7c734c12403928e812141e2c56eb0 with SHA-1 01a5e2f9df is in history

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

Change-Id: Ic008fdcd1460cbd077f6df7913b9aeddbcdef394
tree: 9c62c73048cd4e93d33cc5afbed9daa8ee33d963
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg