Volume adjust sound preference

Conflicts:
	core/java/android/provider/Settings.java
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

sd