Revert "Settings: Quick Settings...add all the things (2/3)"

This reverts commit 91142a7785f4fd8423741dfc07295be2563719a0.

Conflicts:
	AndroidManifest.xml
	res/values/gummy_arrays.xml
	res/values/gummy_dimens.xml
	res/values/gummy_strings.xml
	res/values/strings.xml
	res/xml/gummy_interface_settings.xml

Change-Id: Id5285eb2c6ad35aeb07b801b9ebb1c15a09319e5