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

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

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