[automerger skipped] Merge "AudioFlinger: Update DeviceEffectManager class...

[automerger skipped] Merge "AudioFlinger: Update DeviceEffectManager class includes" into main am: ecd57471 am: 0db31d76 -s ours am: c15b7cdf -s ours am: bf1b0d0b -s ours

am skip reason: Merged-In I05b1a7fafe66dde48b23f1659b8484dfa21fd04c with SHA-1 9a3f8187 is already in history

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



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