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

Conflicts:
	res/values-pt/cm_strings.xml
	res/values-ru/cm_strings.xml
	res/values/cm_strings.xml
Merge branch 'cm-11.0' of https://github.com/CyanFox/android_packages_apps_Settings into CyanFox-cm-11.0

Conflicts:
	res/values-ru/cm_strings.xml

Change-Id: I0b7d5a9e2a139d7e50bb3cb11c477e442aac0e00
Merge branch  into cm-11.0

Conflicts:
	res/values-ru/cm_strings.xml
	res/values/cm_strings.xml

Change-Id: Iafe7e6ed66cd97d513073f4d1d9609b48b2340b4