I don't know when this will happen. I live in London. I don't actually drive personally so I take a lot of Ubers and public transport. I travel periodically but usually within Europe. I'm not dying to be in a self-driving car, but if I get the opportunity, I'll do so if it's convenient.
This will resolve if I get a ride in a friend's car, or if I hail a Robotaxi, or in some other circumstance.
In terms of branding, I'm thinking about the clearest branding on the exterior of the vehicle. So if it's a Toyota manufactured car with a giant Uber decal, that will resolve Uber. If it's a plain Tesla, then it will resolve based on the Tesla logo on the front. If Bolt rebrands to CoolCarCo and I take a ride, this will resolve Other, not Bolt.
If you'd like an option added without spending mana yourself, let me know.