am 06b93a48: Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev

* commit '06b93a48ad0d2274ff41683e08b8a1429045b0a9':
  Revert "UsbDeviceManager: fix b/21429947 regression"