Bug 1098251 - Allow a contact to be created with either a phone number or an email address. r=MattN