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