Merge "Fixed crash in data retry manager" into tm-dev am: 4ada638e am: 782a3370

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



Change-Id: Ibcc73e79f416b85860f4395cc4f12f0e93853d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>