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

* commit 'b2c718146b1be18942bc5d76be68e0d437cbbe8b':
  UsbDeviceManager: fix b/21429947 regression (try #2)