Merge "EffectReverbTest: Reduce runtime by limiting combinations tested" am: 4c9467438d

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

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