[automerger skipped] Merge "AudioFlinger: Extract DeviceEffectManager class" into main am: 4384e3fc27 am: 9e6c85f126 -s ours

am skip reason: Merged-In Ica9b4df3dc148310d1dc03d0dab86db56c20475d with SHA-1 ca2ebe5fb4 is already in history

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

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