Revert "Merge commit 'refs/changes/01/801/3' of https://gerrit.slimroms.net/SlimRoms/packages_apps_Settings into vaosp"

This reverts commit 6a20f470a3e631312ad74e386c161069dcf17d0a, reversing
changes made to b52b36771b797316272aa1af82961c9974a9c089.