Merge "Fixed crash in data retry manager" into rvc-dev am: c51efd8d

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

Change-Id: Ic020a05eecaec832798b177fbfc8351121191a9c