Settings: Ability to Enable/Disable Smart Wake covers
Change-Id: I4339245881d682a653b84a1b8ef57182e650156e

Conflicts:
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java