Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
am: ed4d5fc925

Change-Id: I7f97967d9cb7c6131489ab7202734c24e4076d2a