am bf35150d: Merge "Revert "Revert "Add color to PhoneAccount objects (2/3)""" into lmp-sprout-dev

* commit 'bf35150db3ad0ce05130db1880485da167d2e373':
  Revert "Revert "Add color to PhoneAccount objects (2/3)""