Reset Blacklist and other telephony changes

* Revert "Settings: Show Baseband version on MSIM devices"
* Revert "Settings : Launch only contacts picker for blacklist entry"
* Revert "Blacklist: Fix launching blacklist settings"
* Revert "Forward port SMS rate limit setting"
* Revert "Add missing blacklist xxhdpi drawables."
* Revert "Settings: Alert user when they attempt to add an invalid number to BL."
* Revert "Add back blacklist settings."

Fix derp

Settings : Filter spam notifications

Change-Id: I4056aceada3cf8397827037bcb52388de9f8b9fc

Conflicts:
	AndroidManifest.xml
	res/xml/battery_saver_settings.xml
	src/com/android/settings/liquid/SpamList.java

msim: revert some changes

Revert "Get icc operator numeric from TelephonyManager"

This reverts commit 115f3eb53426b7963f7fd94ad179862dbd4623f1.

Revert "Fix apn population issue on msim"

This reverts commit c34cfb6d6bd3a94ac86af64c5a10d3984b84355c.

Revert "Fix mcc, mnc population on multisim"

This reverts commit 65cbe34d0be20c47c23dbdf693f780e20e91fa5c.

Revert "Telephone(MSIM): Multisim UI changes."

This reverts commit 4443099885bef6a5ada27f68d41c5eecf2f597a0.

Conflicts:
	src/com/android/settings/DataUsageSummary.java
	src/com/android/settings/SelectSubscription.java
	src/com/android/settings/deviceinfo/msim/MSimSubscriptionStatus.java

Revert "Telephony: Use new apn.sim.operator_numeric property."

This reverts commit 4681902e748097f7201fb4c1473dd5c449d0c7d7.

Revert more blacklist stuff

Revert "Merge fixes"

This reverts commit 555e8c0003fba020c2c5f257dda969b1937433bb.

Conflicts:
	res/xml/blacklist_prefs.xml
	src/com/android/settings/SettingsActivity.java

Revert "Settings : Filter spam notifications"

This reverts commit 800a8c3d2bed6922a0323af7990b22e84eb9f343.

Conflicts:
	AndroidManifest.xml

Revert "MSIM: Update SimSettings UI elements dynamically"

This reverts commit 7286f3fc7230373ed1ed161c9dde9b248f27d181.

Revert "Conditionally remove the 4G/3G SIM card option"

This reverts commit e053224612f0b492f9663e27772f50ad4184c059.

Revert "Settings: Select preferred primary sub."

This reverts commit 9d7f878994a078ee817e339a87f09588ea09a754.

Conflicts:
	res/values-zh-rCN/strings.xml
	res/values/strings.xml

Revert "Manual provisioning clean up"

This reverts commit 5f6f9927b4aa212ff6c3570c7f55a46efe6617ef.

Revert "Compilation Fix on New AoSP"

This reverts commit 483e79aaac617abfae994198bdabcb2c525e18c0.

Conflicts:
	src/com/android/settings/SelectSubscription.java

Revert "Settings: change argument list to SubscriptionManager method calls"

This reverts commit a9d3737634f1d38b369bf62e097ba440f0b0ec2e.

Conflicts:
	src/com/android/settings/SelectSubscription.java
	src/com/android/settings/deviceinfo/msim/MSimSubscriptionStatus.java

Revert "Add Manual Provisioning Support."

This reverts commit d91cbae019a0f86638ed5a0278f4d846761e1df6.