Frameworks: UMS [1/2]

Conflicts:
	services/java/com/android/server/usb/UsbDeviceManager.java