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

(cherry picked from commit 77e4b98714c2d0150b09c69c4d0f19c8d84007cf)