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

[automerger skipped] Merge "AudioFlinger: Update DeviceEffectManager class includes" into udc-dev-plus-aosp am: 367d3dfb am: 1c4a715c -s ours am: cccb1a02 -s ours

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

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



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