Fix connect during retry.

A previous fix to help us ignore obsolete messages introduced a bug:
in the DataConnection.mRetryingState if we get a request to CONNECT
we noted we already had that apnContext in our list and would not re-add.
This was a loose translation from when the list really was a list,
but now that it's a map we need to update the ConnectionParams with the
latest or we'll remember the old obsolete generation number.

The fix is a simple removal of the if(contains).  The rest is some logging
improvements to help out next time.

bug:24242653
bug:22776917
Change-Id: I934cc6bdb4f165e84f19f9cdb05a86a44912bdf8