Do I need a VISA for the following scenario in Shanghai airport?

I am a US Citizen and Passport holder. My flight leaves Tokyo, stops in SH for 16 hours then goes to Bangkok and then returns to Tokyo. Do I need a VISA if I want to leave the airport and get a hotel? Does this qualify as a round trip for me since I am not a resident of Japan?