Merge "Fix the concurrency issue in AdbDebuggingManager that leads to Watchdog" into main am: 2025947d2a am: 8aeea9fab9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2921307

Change-Id: I46034fa9d9f75ceb4ac506ad740e459d39b42bb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>