Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Merge remote-tracking branch 'PA/kitkat' into legacy-staging