24 hrs Free Transit Query in Shanghai for Malaysian Passport Holder

Hi, I hold a Malaysia passport and currently residing permanently in the US (green card holder). I will be flying from New York (JFK) to Singapore (SIN) in October with a 19 hrs stopover in Shanghai (PVG). Can I apply for 24-hour TWOV at Shanghai Airport (PVG) on arrival for free to tour the city?

On my return trip two-weeks later from Singapore (SIN) to New York (JFK), I also have a 13 hrs layover in Shanghai (PVG). Can I again apply another 24-hour TWOV at Shanghai Airport (PVG) on arrival for free to tour the city?