Merge "Replace android auto assets with the latest am: e45311adc9 am: a7ad4e2e45" into nyc-mr1-dev-plus-aosp