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

This reverts commit 700c321998b6870df1437d3a334622b6212e523e, reversing
changes made to a17d5a3ed681ac802a455b7c8fcbf8061b8b81d0.
Revert "Merge branch 'qcril' of git://github.com/CyanogenMod/android_frameworks_opt_telephony into cm-11.0"

This reverts commit 700c321998b6870df1437d3a334622b6212e523e, reversing
changes made to 33c2de88416a6b8e6452a9ef1c926eea8433f684.