Transiting at Pudong International Airport to Japan

Hi
Appreciate if you can confirm if the 72hrs visa free transit is applicable for my itinerary.
Australia - Shanghai Pudong (transit but need to stay overnight, connecting flight departing early morning) - Japan
Japan - Shanghai Pudong (transit time about 3 hrs) - Australia
Given I will be leaving the airport to my accommodation for my onwards flight, will I be require to obtain a transit permit from my air carrier prior to my arrival or I only have to advise my air carrier and custom will sort out my transit permit when I arrived?
Thanks Vivien