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

This reverts commit 5ddcf178410a257ed96a9a1e21316cb5b85da0f4.

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