Revert "Merge branch 'kitkat' of https://github.com/AOSPA-legacy/android_packages_apps_Settings into kitkat"

This reverts commit 9132064f33252e84f2e25bd325f84aff16b6bf83, reversing
changes made to 482bde5703a0d3b18b7558e1d0e17ab64ce222d4.