Hi, Multiple Stops

I am flying from Laos to Kunming, with a 7 hour layover where I will stay in the airport. I then fly from Kunming to Shanghai (SHA) where I have a 12-hour layover, and need to change airports to Shanghai (PVG) airport catch my flight out of the country. Does this qualify for the 24-hour visa?