Option to use volume keys to control media volume anytime

Conflicts:
	media/java/android/media/AudioService.java