Merge changes from topic "AidlAudioHalModuleConfig" into main am: 43543bda62 am: 5417f10563 am: 45dfe4efad am: b9b5f8335e

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

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