Revert "Merge commit 'refs/changes/21/721/3' of https://gerrit.slimroms.net/SlimRoms/packages_apps_Settings into vaosp-sabermod"

This reverts commit f08d3fbae2cd93870676041f3205a163e45c49db, reversing
changes made to 3ccc96cb2e9b6f28f3c0f8af235a651da293f40f.