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

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

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