Revert "Audio/Volume: Fix volume button playback control"

This reverts commit 4e4343c8f2c7bca872a6ba81de4b0893eb07dcb7.
Fix volume key music controls and wake up

* Forward port code from cm-11.0 and adjust for 5.0

If wake key and music control is on:
 - Short press will wake up and change volume
 - Long press will wake up and change music

If only wake key is on:
 - Short press will wake up and change volume
 - Long press will wake up and change volume

If only music control is on:
 - Short press will change volume
 - Long press will change music

If both are off:
 - Short press will change volume
 - Long press will change volume

Change-Id: Ie0ad83965c41fd33120490c25a4ff3d9b2cbeb37