Merge "Remove phoneId from ImsUceManager"