Merge "Clean up EffectHalInterface" am: 3bc9e1368b am: 9297e935ff am: 3b5e54e12b am: 3a21a70612 am: 5487c7bbf2 am: 9c0160d891

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

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