[Framework] Alternate Default App Picker (1 of 2)

Change-Id: Ia00120c61b81c7d90fc81ca0049dcc713644e11b

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