Merge "Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService"