Merge branch 'sm-kk-mr1' of https://github.com/SaberMod/android_packages_apps_Settings into sm-kk-mr1

Change-Id: I81ba76882f30fe1d55f0c15eb7cca70cadad0cc1
Merge branch 'sm-kk-mr1' of https://github.com/SaberMod/android_packages_apps_Settings into sm-kk-mr1