Merge "Use 'audio_port_config' in DeviceHalInterface::add/removeDeviceEffect" am: 9ee7d5c07b am: 1e0e8ff60b am: 8e6841116c

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

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