Merge "EffectReverbTest: Reduce runtime by limiting combinations tested" am:...

Merge "EffectReverbTest: Reduce runtime by limiting combinations tested" am: 4c946743 am: 916c897b am: c17b7903 am: 895b7fda am: 662f7437

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



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