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

am skip reason: Change-Id I222df79d38ffc157f39a58bf37b4c7d6ae08ad34 with SHA-1 ff65878137 is in history

Original change: https://android-review.googlesource.com/c/device/google_car/+/1323592

Change-Id: I68368f0a709ae6f8e9d36fc285298221d9ca32b8
tree: ff2fd9aae7cbd559d81bfed0d91e080ec59da124
  1. AndroidProducts.mk
  2. OWNERS
  3. coral_car/
  4. crosshatch_car/