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

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

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