DisplaySettings: Add hardware-framework support for color enhancement

Change-Id: I9fa4e7409266ce9e658c93ae32940050cfe437d2
Merge "DisplaySettings: Add hardware-framework support for color enhancement" into cm-11.0
Merge branch 'cm-11.0' into kk_mkt

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

Change-Id: I4dc51473622485eb3e7d3927b5aff7499df86121