The new agreement, which builds on an earlier announcement, calls for the German automaker to invest $5.8 billion in Rivian, a maker of electric vehicles.