Revert "MSIM: Expanded StatusBar: Show SIM slot number"

This reverts commit 2cd9c3e116077f1d1b36c393c08249896e1b3cfe.
Revert "MSimNetworkController: Set debug to false."

This reverts commit 70e78fbbab463a3e08fba72ceb90b600f4892b28.
Revert "MSIM: Rework statusbar, order signal clusters to match settings"

This reverts commit 9997e9c6ec0f4f2a88df2e2865d5922c0369ae79.
Revert "msim: Add DC-HSPAP support"

This reverts commit 4ec5d36021eceb50c30d550358137676b70135de.
Revert "MSimNetworkController: fix Quick Settings"

This reverts commit d87f9e6bd767fb4eb59fa4c5b6ee3eb6219c9a08.
Revert "Fix WifiHandler for MSim"

This reverts commit 31e850ab5127ea82f00ef5b6fd12735a4540d2d1.
Revert "Core/Keyguard: Cleanup CAF additions"

This reverts commit 588e8c9a2b6ea82aa51cee6e6711671bbb854fa7.
Revert "Untangle the statusbar for dual sim"

This reverts commit 087282308595604ab4902e23307213ee5d4c4563.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Revert "underp PhoneStatusBar"

This reverts commit 4e8abef891beb9f9b0696308c6488d7f05c246a2.
Revert "MSIM Telephony Fixes"

This reverts commit 3fe078f85bc11d8bc68edc254d0bba541f2a25a1.

Conflicts:
	core/java/android/net/NetworkPolicy.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Revert "Telephony(MSIM): Add control flag for SIM app auto provisioning"

This reverts commit 2ddff26ab29182e3ecfd141e01b26db461c0b21f.
Revert "Telephony: Implementation for IWLAN."

This reverts commit 304ae21b69d1b6d85ec00016b1ed7fb1a055e6ed.

Conflicts:
	core/res/res/values/config.xml
	telephony/java/android/telephony/TelephonyManager.java
Revert "Mms: Add interface to support sending sms with origination port"

This reverts commit e1a3678b4958cb43cab3377848b9cb112ed64918.
Revert "Add config for the expire age of partial segment messages"

This reverts commit aa042543438f49f39ff69842fa51b38c1ba3f47a.

Conflicts:
	core/res/res/values/config.xml
Revert "Update for IP call prefix"

This reverts commit 7e8d0d29924d7906189a7e0a7bc6b91f99cd73a5.
Revert "Add support for IP call prefix"

This reverts commit 9baefff11a95e42f615597dc38577a5f73e4b965.
Revert "Message priority support for 3gpp2"

This reverts commit daf1becd24216aaf6101419a12aa863884f847fd.
Revert "Ringtone: Add the default ringtone for multi SIMs"

This reverts commit d198a962d3bbeda7067a1880a037a5d75eee2096.
Revert "Telephony: Set the value of min match according to one property"

This reverts commit 3a32c20bded8df52861ba36504b1741e4e497ec5.
Revert "NetworkController: Hide signal strength icon when no SIM icon is shown"

This reverts commit c46497a32bbf5d8288ddda1b85a58bcc725a6544.