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

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

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