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

[automerger skipped] Merge "AudioPolicyEffects: Add thread safety annotations" into main am: e9bcb2fb am: b4efe510 -s ours

am skip reason: Merged-In I3eff2e555863ba2c40bce8232441e9def64e55a2 with SHA-1 d3595ed0 is already in history

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



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