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

Change-Id: Ie0bf97966f8447ec6426e5c98265afef641b147a