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

[automerger skipped] Merge "DeviceEffectManager: Add clang thread safety annotations" into main am: 17fbffc7 am: f3690060 -s ours am: 950d35b0 -s ours

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

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



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