On a basic level like algebra and geometri it should be required to learn, so that everyone are capable of scripting to existing applications. Also everyone should be taught computer science on an intro level so they will have the basic understand. Finally some overall topics should be covered such as what AI is, what it might do in the future but also how the internet or cloud is structured so it's not too SciFi for the general population.
There's no doubt that within 10-30 years that at least 50% of the jobs are related to Computer Science/Engineering/What-ever-subtitle.
There's also no doubt that paper jobs such as accountant and lawyer will see a great decrease in demand as default tasks can be converted to algorithms. Taxi drivers and bus drivers are also in risk, but the political barrier is greater here, allowing self driven cars. It might be beaten at first by self driven track transportations (train, metro, mono rail, ..)