Waymo is doing good work but it's still very much a science-fair project, just another side hobby of Larry and Sergey.
Self-driving taxis will be a "market" someday, but not yet, and when they are, there is no reason to think Musk will be a force to be reckoned with. (Well, no reason other than the regulatory capture that he's no doubt putting into place now, that is.)