Revert "Framework: safe headset volume option (1 of 2)"

This reverts commit 3d243347cd1ea17b8b773ef0bb6bce9d385c0102.
Framework: safe headset volume option (1 of 2)

thanks DvTonder

Change-Id: I5355820a24d48c1d8f54ea17a7022d891ad07857

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

Conflicts:
	core/java/android/provider/Settings.java