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

[automerger skipped] Merge "AudioFlinger: Add clang thread safety annotations" into udc-dev-plus-aosp am: 154ff0a6 am: 294fe211 -s ours

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

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



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