Add back backlight brightness curve adjustment.

Change-Id: I58408111d6366a281303afb469d78588ae88d275

Conflicts:
	services/java/com/android/server/power/DisplayPowerController.java