Also removed an unnecessary check on the device ID being set, since the Flow types indicate it should always be set.

Depends on D12108

I tested the flow using staging, with my phone as a primary device and a local simulator as a secondary device