Merge "Revert "Add work profile support for registering phone accounts ...""