Build V41
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Settings into cm-11.0

Conflicts:
	res/values/cr_strings.xml

Change-Id: I80d625392a823cf4b72132c465b5bf7b8899f08e