[2/2] Settings: allow disabling volume adjust sound

Change-Id: Ie0547b79d191674ab9d84a0e6a08b1ca29b8bcd9

Conflicts:
	res/values/custom_strings.xml
	res/xml/other_sound_settings.xml
	src/com/android/settings/notification/OtherSoundSettings.java