Option to disable button backlight (2/2)

Change-Id: I230addcfe962263608783d135224d5265a8969b5

Conflicts:

	res/values/strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java