[automerger skipped] Merge "Add AudioFlinger to MelReporter thread safety...

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

am skip reason: Merged-In I1c52aadc7558d19e4efc5843cbd10791c3a97b6b with SHA-1 0b2608c9 is already in history

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



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