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

Change-Id: Ief24c89bc57a71694a56118bc1e67a808aee876d