Revert "Option to use volume keys to control media volume anytime (2/2)"

This reverts commit 258a3340ac4388f8cf4f253b2415152743b9e3b4

Change-Id: I0c02e35ecb841a91c2da3bbe0f55ff95703a9337
Merge "Revert "Option to use volume keys to control media volume anytime (2/2)"" into jb2