Merge "UsbDeviceManager: Include kernel USB state in dumpsys output"