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

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

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