Vol rocker wake and audio

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

Change-Id: I3f4d0b4f6b4af0edec315a4a17d4945fb1238f72