Squash UMS Commits [1/3]

Credits: CyanogenMod

Change-Id: I09ed8bcc053f545377f28839673eadd2b9a2b872

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