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

(cherry picked from commit d41d20b6ea25735b5b53e2044a2faa5d3017aa6d)