Also disable GPRS preference for XT897C
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2

Conflicts:
	MSM8960Parts/Android.mk
	MSM8960Parts/src/com/cyanogenmod/settings/device/DeviceSettings.java