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