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

This reverts commit 74525d76205cd61ac5e2b74c1abe1fee21445bf4.