am 5025058e: Update uses of PhoneAccount builder methods.

* commit '5025058e1835f8b83f724cbf25020cdadc560a40':
  Update uses of PhoneAccount builder methods.