Merge "Make EffectFactory implementation thread-safe" into main am: cdac9b50...

Merge "Make EffectFactory implementation thread-safe" into main am: cdac9b50 am: bee170ab am: 0a48f763 am: ebe6a27a

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



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