Transit Visa? USA->Shangai->Hong Kong->Shanghai (layover 2 hours)->USA

Hi, would I quality for the 144 hour free transit? Departing from USA on 12/23. Arriving in Shanghai on 12/24 at 4:20 PM to go on a cruise from Pudong to Japan (6 days). Cruise ship will return on 12/31 in the morning. Will be leaving the same day to Hong Kong for NYE. However, for the return trip it will be from Hong Kong to Shanghai for a 2 hour layover then back to Honolulu.

Transit Visa? USA->Shangai->Hong Kong->Shanghai (layover 2 hours)->USA