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

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