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

Merge "Fixed crash in data retry manager" into rvc-dev am: c51efd8d am: 64dd4566 am: c9a3a43e am: 2bd2e573

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

Change-Id: I29204ee656bfd89887c50c07cf4c9720358aa33f