Fix merging errors
Revert "Fix merging errors"

This reverts commit 7f61b5d37bacf3c91ac42f1ece26f9f10c992f33.
Revert "Don't wake the screen for media playback KeyEvents."

This reverts commit f9a482ef97c6dc7da66bc5a018268d8405a10087.
Revert "Volume rocker wake rewritten."

This reverts commit 3161b64433fd01d9e7e2cf1de0d4b43f218938b4.
Revert "Lockscreen VolCtrls : Don't raise volume on skipTrack"

This reverts commit 69fc39e0540bb1423d0b41a5feeee24478417b00.
Revert "Port "Framework Track Control : Switch from broadcast to audio service""

This reverts commit 25cbd579b2822ce9e9839f9250c080ef0fea1032.
Remove volume rocker wake completely since it doesn't work, but

don't remove music control