Merge "libaudiohal@aidl: Properly handle "legacy" r_submix case" into main