[automerger skipped] DO NOT MERGE Revert "DO NOT MERGE: Add coral_car and crosshatch_car to Q" am: ff65878137 -s ours am: 8ca5e08996 am: 3b96ad07bb

Original change: undetermined

Change-Id: Iab97d83256ced630c87b51ae67dc9dfb0bf84f78