Feat: Allow users to disable safe headset volume warning (2/2)

Change-Id: I6211b7698ab299c3d77a6a57fb41c296865dce7a
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1

Conflicts:
	res/values/strings.xml
	res/xml/sound_settings.xml
	src/com/android/settings/SoundSettings.java

	modified:   res/values/strings.xml
	modified:   res/xml/sound_settings.xml
	modified:   src/com/android/settings/SoundSettings.java