I doubt it. Vertical integration only works so far.
I think the manufactures will sell cars to those want to run a taxi company. This is, and will remain a race to the bottom because competition is fierce: people buy price and first to get to them.
They will also sell cars to normal people. Most people don't think about how convenient it is to have the storage of their personal car. If parking is free or cheap (which is it in the suburbs) having your golf clubs in the trunk or a spare diaper in the glove box are worth the little extra cost, not to mention your car is always there so no need to wait for the taxi to in busy times.
Of course there is also the city, but if you live in a city self driving cars still suffer from congestion and so public mass transit still has big advantages. In fact because the self driving taxi is spending time empty waiting for the next rider it adds to the problem meaning for even more people public transit is worth the hassles with it (which in turn means more demand to make transit better)