Alternate default app picker (1/2)

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/drawable-xhdpi/ic_notification_overlay.9.png

Change-Id: Ice840810472a2a9c1a71bedfd43dce2a28811d26