Build V43
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: If2681e336e8dfe9401ae81ade54bf07d4de2e9f9