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: I651199c87774ef5b25c91e53e04e0be225d73b1e