Yes, that's the right combination. Just make sure you get the pink paper from the first bunch of people checking phones/tablets when you get off the plane and you should be fine. Depending on which airline you're arriving on you may encounter several sets of them before you get to Immigration. The last couple of times I came in through Haneda on Delta (very long walk) they were in the jet bridge and right outside in the gate area. Also several groups waiting for other flights in the hall way and a bunch right where the testing station is before Immigration. If you've got the pink paper then you should be able to head straight to Immigration, Customs and out.