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

Change-Id: Id7a786b3ee5df875d4c9b2cad79f0234d9c8128e