Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev