[2/2] Settings: Option to enable Notification Light when screen is on
This makes it possible to let the Notification LED flash even when the screen is on

Change-Id: If7209d62918a1ddf5701986809a22c3cccc14263

Conflicts:
	res/values/cr_strings.xml

Conflicts:
	res/values/cr_strings.xml
	res/xml/notification_light_settings.xml
	src/com/android/settings/liquid/notificationlight/NotificationLightSettings.java