update volume button music control code

Change-Id: I2f4ff7de0441c5677e9c87f8078e314d877d9431
Signed-off-by: scott <scott@ubuntu>
Fix volume key music controls and wake up

- Forward port code from cm-11.0 and adjust for 5.0
- Fix not being able to adjust volume when music control is on
- Disable screen off volume/music control when wake key is enabled

Change-Id: Ie0ad83965c41fd33120490c25a4ff3d9b2cbeb37
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Keep quiet when volume keys are used to wake up device

- Userspace will make a 'beep' with it receives a key up, so
  consume that event as well.
- Removed wake key check in music control code as it will already
  be disabled here.

Change-Id: I93839acd39aec8a2ee40291f833a31f6b048c9f8