Revert "Alternate default app picker (1/2)"

This reverts commit 2102235c32b8258af855e3c09e04be181669a1d5.

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