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

Conflicts:
	res/values-de/cm_strings.xml
	res/values-es/cm_strings.xml
	res/values-hu/cm_strings.xml
	res/values-it/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-nl/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-ru/cm_strings.xml
	res/values/cm_strings.xml
	src/com/android/phone/GsmUmtsAdditionalCallOptions.java

Change-Id: I67b577db4a75e21276a072ae8340b05728ed4dba