Yes, unfortunately currently society exists to serve billionaires, and we don’t see that changing much. More automation will just entrench that power further.
We need to eliminate billionaires yesterday, or risk ending up in techno neo-feudalism.
Capitalism is reaching its end road. Things will change, for better or for worse. How it will change will depend on whether politics will support the people, or the rich… and of we continue on without changing much, it will support the rich.