Settings: Revert What I did wrong
Merge branch 'kk' of github.com:PixelROM/platform_packages_apps_Settings into kk