Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev