Revert Adblocker Settings
AdBlocker 1/3

squash of:

https://github.com/LiquidSmooth/android_packages_apps_Settings/commit/13e68b890c1dfa17a0f91e093e75e0968ace9e3f
https://github.com/LiquidSmooth/android_packages_apps_Settings/commit/64d994970cec2690ae7664d1e8d6388a6b203a8f
https://github.com/LiquidSmooth/android_packages_apps_Settings/commit/01942eff1c384f3f4a1f276d0280ea3d9d83ff8d

credit to the original authors

Change-Id: I4b5a2aca90665ef018e35a9abface1f01fbb75a2

Conflicts:
	res/values/liquid_strings.xml
	res/xml/hfm_settings.xml