Gigafactory stakes and a push for self-driving software approval cast the billionaire as a key US envoy while seemingly sealing a reconciliation with Trump.