Merge "Make EffectFactory implementation thread-safe" into main am: cdac9b5064 am: bee170ab74 am: 0a48f7635c

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

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