Settings: volume wake preference

Change-Id: I6a732e627b75a1be533ecd96cb018307de0e5a77

Conflicts:
	res/xml/button_settings.xml
	src/com/android/settings/ButtonSettings.java