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

[automerger skipped] Merge "DeviceEffectManager: Add clang thread safety annotations" into udc-dev-plus-aosp am: bc39ec00 am: 75609552 -s ours am: 2102bad1 -s ours

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

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



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