Remove unneeded settings
Merge branch 'jellybean3' of https://github.com/TheCollective/packages_apps_Settings into jellybean3-sb