Merge "AudioFlinger: Clean up Effect configuration macros" am: fb603cc675

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

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