Merge "Replace android auto assets with the latest" into nyc-mr1-dev am: 91ef993e2d
am: 8f7f6abd09

Change-Id: I53c24a5726bf633474fcba1814bed4ec0ae09217