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

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

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