Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/AORP/android_packages_apps_Settings into cm-11.0