Merge "Allow UsbDeviceManager to start adbd again." into rvc-dev