[3/3] settings: battery light settings

Change-Id: Id97704714c81e47daf9ab56f935dbf23690d9538
Advanced low battery indicator options (2/2)

http://i.imgur.com/EUwRPh7.png

http://i.imgur.com/LX4SrC0.png

Change-Id: Ib3d4c8361f5563729965fe140f379bd7393b4a0a
Merge "[3/3] settings: battery light settings" into android-4.4
Merge "Advanced low battery indicator options (2/2)" into android-4.4
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	src/com/android/settings/DisplaySettings.java