Merge "Fix a regression in UsbDebuggingManager"