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

This reverts commit 69191751e21d820c67e1037eca054041d8d29150, reversing
changes made to bf6fb56b03e46d1f980bea4ef80367b951488103.

Conflicts:
	frameworks/src/com/codeaurora/telephony/msim/MSimUiccController.java
	frameworks/src/com/codeaurora/telephony/msim/SubscriptionManager.java