Merge "Error fix from enabling Clang thread-safety checks." into main am: f3e15b1877 am: 6c8759b359

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3195260

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