24 Hour TWOV question.I will be departing the US on 09/03/2016 arriving PVG 09/04/2016.

I have a 14 hour layover and would like to get a hotel. My outbound leg begins on 09/05/2016 and goes PVG/NRT/MSP/ATL/MCO. Do I qualify for thr 24 hour TWOV? From the reading I have done since I will be passing though Japan on way back to U.S. I would qualify for TWOV. Is what I'm understanding correct?