Merge changes from topic "aidl_audio_effect_5" am: bbefdc5d am: 243f9db0...

Merge changes from topic "aidl_audio_effect_5" am: bbefdc5d am: 243f9db0 am: 5fe890c5 am: 7e64fdc4

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



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