am 995a044b: am 5025058e: Update uses of PhoneAccount builder methods.

* commit '995a044b2719cf790575afefda9d394644efebf9':
  Update uses of PhoneAccount builder methods.