[automerger skipped] Merge "Error fix from enabling Clang thread-safety checks...

[automerger skipped] Merge "Error fix from enabling Clang thread-safety checks in Cuttlefish" into main am: 4239a06d am: d30ea404 -s ours

am skip reason: Merged-In I9be1254c3e2685b0aa950b314c581824f40ce26c with SHA-1 85e62f11 is already in history

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



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