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