Merge "Error fix from enabling Clang thread-safety checks in aosp_panther"...

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

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



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