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

[automerger skipped] Merge "Add AudioFlinger to MelReporter thread safety annotations" into main am: 39e51be3 am: 33f8c856 -s ours

am skip reason: Merged-In I1c52aadc7558d19e4efc5843cbd10791c3a97b6b with SHA-1 37169fca is already in history

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



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