Does the 144 hr free transit to apply if we're taking a cruise that starts and ends in Baoshan

We are arriving from the US to PVG staying 2nts in Shanghai and then leaving China on a Royal Caribbean cruise out of Baoshan (Shanghai), China for 8 nights then returning from Japan back to Baoshan and flying same day from PVG back to the US. Are we eligible for the 144hr free transit? thank you!