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 ce10db6b3f12ced1eae1586a2a0fe792bffcb9ec)