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

[automerger skipped] Merge "DeviceEffectManager: Add clang thread safety annotations" into udc-qpr-dev-plus-aosp am: 76a09a3f -s ours

am skip reason: Merged-In I463a9749c9aaca8c759e687ae37c575d39e43344 with SHA-1 3e07ef09 is already in history

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



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