I'm not sure it's realistic for many or any countries to move manufacturing out of China. Say assembly is moved out of China, they still need to source the parts, and how far do you go with this? To the point where Apple is making, in their own factories, every resistor, capacitor, logic IC, ribbon connector, PCB etc? This would seem to require a reversal of the changes in manufacturing that have occurred over recent decades in a much shorter period of time.
I am no fan of China - in the news recently a couple of our politicians have been called out as having a 'cold war mentality' just because they pointed out there differences between Australian and Chinese values - but I have to keep using Apple devices to develop and support software for clients. Likewise, I bet no matter what Apple does there will be others who stick with them as a matter of commercial reality. 'Commercial reality' has been and will continue to be China's way to be a mandatory part of world events.