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

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

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