Add back notification light settings.

Change-Id: I474a14a1b395407f5ca273a5d6a3a7f03f7e4698

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	src/com/android/settings/DisplaySettings.java