Merge "Effect AIDL Refine effect test parameter combination list" am: c6d1c3840a am: 69a2d343bf

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2368673

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