144 hour Visa free transit to Shanghai, China

Hello !
I have expedition tour in Bhutan in October.
I am flying with China Airlines from Los Angeles/USA to Shanghai, Bangkok and then with Bhutanese Air to Paro, Bhutan . After the tour I am staying 3 days in Bangkok, and flying back again to Shanghai with China Easter. I would like to stay in Shanghai 4 nights for sightseeing before I fly back to Los Angeles.
Do I qualify for 144 hour transit without visa. Thank you for your help.