Wtf was I thinking
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk