Add back increasing ring settings.

Change-Id: If33afa88adde6ae6fa23f0e3be779b1b7531e3a3

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml