Merge "AudioFlinger: Remove conditional effect types" am: 9eb3b47eb2 am: 4e44a210c6

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

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