Fixed network request was removed before retry

Fixed by not removing the request from the retry entry.
The request should remain in the retry entry for later
on total failed retry counting.

Fix: 229827727
Test: Sanity + atest DataNetworkControllerTest
Change-Id: I2bf3dc81ae451a8504fcde246d03569395611d0d
Merged-In: I2bf3dc81ae451a8504fcde246d03569395611d0d