[automerger skipped] Merge "AudioSystem: Add thread safety annotations" into...

[automerger skipped] Merge "AudioSystem: Add thread safety annotations" into main am: c2dab3d2 am: 2fd41e43 -s ours

am skip reason: Merged-In Iffd72f06d51709cc28bc4adf5a71269c4b540b50 with SHA-1 acd955ac is already in history

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



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