Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast"