I think you'd do the self-driving market a disservice by bundling it with expensive range-limiting technology. If both are positive changes in their own right, then they're better off keeping them available separate for maximum adoption.

That's even more so the case with self-driving cars, since their ideal use cases (highways) are the least ideal use case for vehicles with short ranges.