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

Change-Id: I7d992d83ebd185c1e67ecd24c3d5fd30e4c87fb8