Merge "Fixed network request was removed before retry" into tm-dev am:...

Merge "Fixed network request was removed before retry" into tm-dev am: 2c41127b am: 01a8f135 am: 73ba55f0 am: 478d5c37

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18013645



Change-Id: I3be1e44dcafe022cbbff723acd22d6fe5379bd83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>