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

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

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