Merge "Change secondary_text_color to match spec" into pi-car-dev am: ef9b360c2a
am: 70d5d81797

Change-Id: Ic6ffea867133d4823dbc9ed2828f57426111f9ec