Add back increasing ring feature.

Change-Id: Id950d3c19a05e4efb9ed0b36be6a7482dd173965

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