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

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



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