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

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



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