Forward port button/keyboard backlight options

Change-Id: Ica02fad15392201b719144c4b911407d5b370cee

Conflicts:
	src/com/android/settings/ButtonSettings.java