Remove lights settings unless intrusive LED bools are true

com.android.internal.R.bool.config_intrusiveNotificationLed
com.android.internal.R.bool.config_intrusiveBatteryLed

Change-Id: I8883d68bc7e82d295a1d47b3ca3777525350d854
Add back missing Notification ringtone title

Change-Id: I9aed1c6b1cd177b0664ffd04965936aa68958713
Merge branch 'remote' into mkl

Conflicts:
	res/xml/notification_settings.xml

Change-Id: Ie40ac9c7b16fb3fbd1e7e181da5a8e7d944c4bdc