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

[automerger skipped] Merge "MelReporter: Add clang thread-safety" into udc-qpr-dev-plus-aosp am: f6a9e596 -s ours

am skip reason: Merged-In Ic113ab3569360910e66a42cf3600865080461bc3 with SHA-1 77448a57 is already in history

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



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