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

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

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