Merge changes from topic "revert-2770886-AidlAudioHalModuleConfig-FQCMWOWMCH" into main am: 03a2fbc6a3 am: fb1d459f09 am: 9868600b48

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

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