[automerger skipped] Merge "AudioFlinger: Clean up Effect configuration...

[automerger skipped] Merge "AudioFlinger: Clean up Effect configuration macros" am: fb603cc6 am: 6dc0a48a am: 4641074b am: 37802e77 am: 83d689e4 am: 5b5d2e9a -s ours

am skip reason: Merged-In If2cdda0fac533b8aa59f1e5d44bdc3e7f06001ee with SHA-1 afdc5475 is already in history

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



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