Revert "Revert "Notification sound-to-vibration conversion toggle""

This reverts commit 884babc4c0eadc22221695d2bb8a61d8969d0616

Change-Id: Iaf992dcceb3a1c10e7354e4b9d9a5bb995104f9a

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