Settings: add volume rocker control (wake up) (2/2)

Change-Id: I4ddf4a792f3512716bb876ded964ae37f6076e83

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