[automerger skipped] Merge "AudioFlinger: Add clang thread safety annotations"...

[automerger skipped] Merge "AudioFlinger: Add clang thread safety annotations" into udc-qpr-dev-plus-aosp am: 96c0d4ee -s ours

am skip reason: Merged-In Ie9191ae3791e0fdddc821f277cc1c01833cda94d with SHA-1 c2cf7ec6 is already in history

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



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