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

[automerger skipped] Merge "AudioFlinger: Add clang thread safety annotations" into main am: 722c9c91 am: a68ceb66 -s ours am: ef6b206a -s ours

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

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



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