Merge "Error fix from enabling Clang thread-safety checks in Cuttlefish" into main am: 4239a06d

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



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