Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev