[automerger skipped] Fixed crash in data retry manager am: d1676846 am:...

[automerger skipped] Fixed crash in data retry manager am: d1676846 am: 5486ef92 -s ours am: 3705425b -s ours

am skip reason: Merged-In Ib26aadf82e13c455189c8caa14ab082e51fa5311 with SHA-1 f5b04de7 is already in history

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



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