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

(cherry picked from commit f81603ca0a0d46db90f0462560bf2794a6d79542)