[automerger skipped] Merge "AudioFlinger: Remove conditional effect types" am:...

[automerger skipped] Merge "AudioFlinger: Remove conditional effect types" am: 9eb3b47e am: 4e44a210 am: 64d148ee am: 85ae030c am: 4c86d1d7 am: 228a3a69 -s ours

am skip reason: Merged-In Ib67fc35ac15858533634b6dc942d5bd8f40574c0 with SHA-1 181d96f1 is already in history

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



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