Trying to change reboot mode on keyguard screen again
(1/2) Volume Rocker:

* Volume rocker wake
* Volume rocker music control

Change-Id: I0b9b252153e1fe048f7048a9da2197797a577ff1
Signed-off-by: Andre Saddler <dresadd09691@gmail.com>
Merge remote-tracking branch 'm/master' into qs

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