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: 19b2959e am: 6e5e26bb

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

Change-Id: I2f7618bf9f17e3269f4ec17990697a172aba25b8