Merge "Fix the concurrency issue in AdbDebuggingManager that leads to Watchdog" into main