[automerger skipped] Fixed car_product resource overlay reference am: 21aac0aa41 am: 54d1565c6f -s ours
am: 5eb7667734 -s ours
am skip reason: change_id Icede2b0a3bbb84226e811d6fadaf44da5f6d5e76 with SHA1 6d78e77334 is in history

Change-Id: I75ec1dab3f7b8182d23afa106b7297f7ceb462a3