Merge "Error fix from enabling Clang thread-safety checks" into main am: bdacb5d4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3341242



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