Rework ContactsSyncAdapter to handle untyped Email and IM data

* This is required to due a change in ContactsProvider2 that removes
  type information for these fields

Change-Id: I993aebdcace0e1db538a85afdea3389fe41518d8
1 file changed