Two of the country’s leading makers of electric vehicles announced they are merging their battery swapping and charging operations.