Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev