Indonesian passport holder transit in Shanghai (21h 40m). Can I get the 24-hour transit visa?

I had transit experience once in Xiamen Gaoqi in September 2023, and I could get a free 24-hour transit visa at the airport (immigration check). I just want to re-check and confirm if I can also get the 24-hour transit visa in Shanghai Pudong (PVG) as an Indonesian passport holder?

I'm flying with China Eastern, my itinerary is Fukuoka - Shanghai - Jakarta with 21h 40m transit in Shanghai Pudong.

Also, if you know by any chance, does China Eastern also provide free transit hotel in Shanghai like Xiamen Airlines?

Thank you.