Merge "Error fix from enabling Clang thread-safety checks in aosp_panther" into main am: 24abe441

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



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