Merge "Merge "Replace android auto assets with the latest" into nyc-mr1-dev...
Merge "Merge "Replace android auto assets with the latest" into nyc-mr1-dev am: 91ef993e am: 8f7f6abd" into nyc-mr1-dev-plus-aosp
am: deee4c8b
Change-Id: I207915ddd212dedc1f043dd6ff2d5227452f23b8