Partial fix for b8022095

With the changes to the DC the list of ApnContexts is cleared when
a DC disconnects. So the connectionId is invalid, instead send the
APN type information which fixes this retry problem.

A larger fix is coming where retries are done in DC but this will help
for now.

Bug: 8022095
Change-Id: I7364d1108c4be853a9d711eb8771d05a7640fe19