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

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

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