Revert "Merge commit 'refs/changes/49/749/6' of https://gerrit.slimroms.net/SlimRoms/packages_apps_Settings into vaosp"

This reverts commit b52b36771b797316272aa1af82961c9974a9c089, reversing
changes made to b0b8a23eb34f61d94b9a0330d37ba9b55558662a.