Volume rocker wake and volume rocker music control

Conflicts:

	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java