US citizen living in Japan

I am living in Japan on a work visa but I have a US passport. I am planning to spend one weekend in Shanghai flying Tokyo-Shanghai-Tokyo. Since I am flying in and out of Japan (rather than coming from the US), do I still qualify for the 144 hour free entry? Thank you!