Settings: Move Notification and Battery light settings to System settings

In an attempt to make the LED settings more discoverable, move it from
Display to System settings.

Change-Id: I374cdd08f330ff367405d204b5eb073efa98f04d

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/SystemSettings.java