Merge "Clean up EffectHalInterface" am: 3bc9e1368b am: 9297e935ff

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

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