[automerger skipped] Merge "MelReporter: Add clang thread-safety" into main...

[automerger skipped] Merge "MelReporter: Add clang thread-safety" into main am: ef966ec8 am: f9588999 -s ours am: bbfa4d31 -s ours am: 09547fb1 -s ours am: bbc58912 -s ours

am skip reason: Merged-In Ic113ab3569360910e66a42cf3600865080461bc3 with SHA-1 5374446f is already in history

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



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