Alternate default app picker (2/2)

Conflicts:
	res/values/strings.xml
	res/xml/interface_settings.xml
	src/com/android/settings/carbon/InterfaceSettings.java

Change-Id: I3fe189eaa812460372c587f025512c12175729db

Conflicts:
	res/values/cm_strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java