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

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

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