Add back increasing ring feature (1/3)

Change-Id: I76c22ea94f25c576972361ad0ab209accb8ae1de

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