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

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

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