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

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I677550b77f3c878136a4ca734985f6731ac56dd1