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

[automerger skipped] Merge "Add AudioFlinger to PatchPanel thread safety annotations" into main am: 7cd766aa am: 683bec32 -s ours am: 0dcac482 -s ours am: cb486f93 -s ours

am skip reason: Merged-In I50aaf6a5fdb3bd9dd9584dd11c6e1ab5b3a1d540 with SHA-1 a123f3cf is already in history

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



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