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

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

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