am 76abca06: am 32e8bc52: Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev

* commit '76abca06ab13e3aaf995fbacc919254efbc2cc31':
  Rename methods/variables on PhoneAccount for API cleanup.