Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I222df79d38ffc157f39a58bf37b4c7d6ae08ad34
Change-Id: Ic335748d77e65708a5133305b798f657f5f35dab
tree: ff2fd9aae7cbd559d81bfed0d91e080ec59da124
  1. coral_car/
  2. crosshatch_car/
  3. AndroidProducts.mk
  4. OWNERS