I think so.

Depending on the country, the car fleet average age is something like 5 to 8 years. So by 2030 the average production year of the cars on the road will be somewhere around 2025.

Lots of car manufacturers are developing the hybrid and electric models for both economic and political reasons. Even though Tesla is a complete hype machine, it is pushing the idea of electric cars as normal into the population.

So by 2025 we will see a large number of electric cars being produced and by 2030 with governments continuing to crack down on emissions we might even see a majority electric car fleet by that time.