am ac146621: Merge "Color refactor (Continuation from FAB CL) (UnifiedEmail)" into ub-gmail-ur14-dev

* commit 'ac146621ebabb59508241cbabdd952b5311644e2':
  Color refactor (Continuation from FAB CL) (UnifiedEmail)