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

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