this reverts merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packag…
…es_services_Telephony into kk44