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

[automerger skipped] Merge "Add AudioFlinger to PatchPanel thread safety annotations" into udc-dev-plus-aosp am: 5737926e am: c5f16e3b -s ours

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

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



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