[2/2]Settings: Double tap to sleep

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