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