Adding CONTENT_TYPE to CommonDataKinds.Email
Adding CONTENT_TYPE to CommonDataKinds.Email

Also removing deprecated API

Change-Id: Ie3bd17282bf57c3a73497c91ce233ed135c79502

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base