Merge changes from topic "aidl_audio_effect_6" am: 6acc2e59f4 am: 317b28bfb7

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

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