Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into k2wl-cm11-testing