144 hrs Visa on entry to Shanghai from USA cruise to Japan 9 days than return to Shangha fly to USA

I am a USA citizen and will arrive into Shanghai on direct flight from Los Angeles. We will spend 4 days in Shanghai than board Royal Caribbean for 9 day cruise to Japan. After 9 days cruising in Japan we return to Shanghai to fly direct to Los Angeles on same day with only 12 hours in Shanghai. Do we qualify for the 144 hr Visa free transit on first entry to Shanghai and than qualify for the 24 hour visa free entry on the second entry to Shanghai?
Thank you,
John