Revert "[Settings] Alternate Default App Picker (2 of 2)"

This reverts commit d9fb69074be7ddeb7325d3bd1ebea3cb4963868a.

Conflicts:
	res/xml/liquid_interface_settings.xml
	src/com/android/settings/liquid/InterfaceSettings.java