Merge "Error fix from enabling Clang thread-safety checks." into main am: 08b63a5a41 am: c0e89d5e33

Original change: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/3188540

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