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

Conflicts:

	src/com/android/settings/DisplaySettings.java