Reset Pattern:
 - If user cancels while creating new pattern, old pattern is restored

Change-Id: I55955b1ffadca2ba712c40c7d443c4fc4b0f528c
DisplaySettings: Add hardware-framework support for color enhancement

Change-Id: I9fa4e7409266ce9e658c93ae32940050cfe437d2

Conflicts:
	res/values/cm_strings.xml
	res/xml/display_settings.xml