Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_services_Telephony into cm-11.0

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java

(cherry picked from commit 118b9940d396c38b093e52eef5de408966c67359)

Conflicts:
	res/values/cm_strings.xml
	src/com/android/phone/CallFeaturesSetting.java