Settings: port vol rocker wake

framework changes already present

Change-Id: I481c62fe573834681ac212ac9d91e5b8c941c3bc

Conflicts:
	res/values/config.xml
	src/com/android/settings/DisplaySettings.java
Add Kill app back long press

Original author: DaneshM

Change-Id: Ide8be24d679d0b3d74bf56b33696dc279de49470

Conflicts:

	res/values/strings.xml

Conflicts:
	res/values/strings.xml

Conflicts:

	res/values/strings.xml