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

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

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