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

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

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

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



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