Option to enable Notification Light when screen is on [2/2]

Change-Id: I31185a30b76e1b1d2195b71d481452893fc0ea58

Conflicts:
	res/values/custom_strings.xml
	res/xml/notification_light_settings.xml
	src/com/android/settings/slim/notificationlight/NotificationLightSettings.java