Revert "TeleService : Fix the network mode wrong issue for ssss"

This reverts commit 3956bbd0b2e95e0a15ac26fd3a0eab3378c09f9c.

Change-Id: I9afc8502170a064ea3abff77807968c1ff0265b3
Revert "Phone: Add support for IP call prefix"

This reverts commit bd3e808debd4cb0c5bf7106848c38a3fe4987952.

Conflicts:
	res/values-zh-rCN/cm_strings.xml
	res/values/cm_strings.xml
	src/com/android/phone/CallFeaturesSetting.java
	src/com/android/phone/Constants.java
	src/com/android/phone/MSimCallFeaturesSubSetting.java
	src/com/android/phone/OutgoingCallBroadcaster.java

Change-Id: I204baca3cf85c39ba87eb7f95e9d20bcd5b8ab88
telephony: incall proximity sensor enabled (3/4)

Change-Id: Ieffcacf421be61d872c5c7b24b5ba5121556c54a
Merge branch 'cm-11.0' into kk_mkt