Merge "audio: Match the r_submix configuration to the legacy impl" into main am: 65747f7ccb am: cb1900c8a7 am: 51b76290be

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

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