[automerger skipped] Migrate packages/apps/Car to aapt2 am: b7dbefb800
am: b5dd100ad5  -s ours

Change-Id: I3e600b2417638dd22b23d366fd9356e89e72239d