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

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

am skip reason: Merged-In I9b4573be8f5f6546d6979f69a9ad8d19e5d95bc6 with SHA-1 972bec1c is already in history

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



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