[automerger skipped] Merge QQ3A.200605.002 into master am: 20e4f3b66a -s ours

am skip reason: Change-Id Icd5c36a89ee87e7f501838d2be465b1da85ce6c3 with SHA-1 370cc82705 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/libs/+/1323628

Change-Id: I23a1d13c81a33ff496838337e1f3546919cfbc7c
tree: 99c6486f53b1da7418ed5ab0ac8fcdf50f08e3bf
  1. car-assist-client-lib/
  2. car-broadcastradio-support/
  3. OWNERS
  4. PREUPLOAD.cfg