Merge branch 'kk' of github.com:CarbonDev/android_packages_apps_Settings into kk

Merged changes from upstream
Merge branch 'kk' of github.com:titanic-fanatic/carbon_packages_apps_Settings into kk