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

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



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