[automerger skipped] Merge "libaudiohal: Make effect descriptors cache...

[automerger skipped] Merge "libaudiohal: Make effect descriptors cache thread-safe" am: a4c2235b -s ours am: 22257733 -s ours

am skip reason: Merged-In Id5f3615074e540afca33a83d53d2b84634df89cf with SHA-1 2b9611ea is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2329975



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