Merge "remove groupId from a PhoneAccount if MODIFY_PHONE_STATE is missing" into udc-dev