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

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



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