72 hour visa free transit clarification

I am traveling US Citizen traveling from Washington to Calcutta India, then from Calcutta to Shanghai via Bangkok where I will board Holland America for travel to Taiwan, Japan, Philippines and conclude in Hong Kong from where I will return to Washington. Does free transit apply in that I will be in Shanghai for 36 hours or less and there is no travel to any other port or city in China.