Framework: Forward port Expanded desktop capability

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