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

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

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

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