Option to use volume keys to control media volume any time

Conflicts:
	res/layout/preference_dialog_ringervolume.xml
	res/values/ras_strings.xml
	src/com/android/settings/RingerVolumePreference.java