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