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: e317326f am: 133b0055 am: bba0c13e

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

Change-Id: Ie0bec05b05d894b4e9c82e728a1b3a2d0f80e351