DisplaySettings: Add hardware-framework support for color enhancement

Change-Id: I9fa4e7409266ce9e658c93ae32940050cfe437d2
Merge "DisplaySettings: Add hardware-framework support for color enhancement" into cm-11.0
Reset Pattern:
 - If user cancels while creating new pattern, old pattern is restored

Change-Id: I55955b1ffadca2ba712c40c7d443c4fc4b0f528c
Settings: Add heads up blacklist options. (2/2)

Change-Id: I13d849b49bee6f516b591625c2ea2e69dff12885
Merge "Settings: Add heads up blacklist options. (2/2)" into cm-11.0
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into HEAD