Revert "Merge branch 'LNX.LA.3.5.2.2.1_rb1' of git://codeaurora.org/platform/frameworks/opt/telephony-msim into cm-11.0"

This reverts commit f94383abe5d71011c9113f3e1aa9f6029422f314, reversing
changes made to 5dacea2e5b4eaf20a1e8651bd48fe7b6378fb8ae.

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