Halo: Add master switch to disable Halo (2/2)

Conflicts:
	res/values-es/strings.xml
	res/values/strings.xml
	src/com/android/settings/narp/HaloControl.java

mbc596

Conflicts:
	res/values-es/strings.xml
	res/values/strings.xml