Revert "Core: Volume options panel 1/2"

This reverts commit cae76b4251739ce52a87f6a4cbed3da0112cee2c.

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