[automerger skipped] Merge "Make EffectFactory implementation thread-safe"...

[automerger skipped] Merge "Make EffectFactory implementation thread-safe" into udc-qpr-dev am: 03937454 -s ours am: 9dc51e63 -s ours

am skip reason: Merged-In I04560c62bdbcfb85dbe223bec0149b112205a323 with SHA-1 074cf23f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24108111



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