[automerger skipped] Merge "Add AudioFlinger to MelReporter thread safety annotations" into udc-dev-plus-aosp am: b355a43c am: ea5f5367 -s ours

am skip reason: Merged-In I1c52aadc7558d19e4efc5843cbd10791c3a97b6b with SHA-1 5b726572 is already in history

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



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