Merge "Fixed crash in data retry manager" into tm-dev am: 4ada638e am: bea69743 am: 4dc3a243

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



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