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

This reverts commit 50f654ebfd39f7e1c89da4d8ed212932c0262210

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