Merge "Settings: AdaptiveBacklight support" into cm-10.2
Conflicts:
	src/com/android/settings/DisplaySettings.java

Change-Id: I95d46c37a25b0ea93e16a129d7e3238596a74e5e