[automerger skipped] Fixed crash in telephony when underlying data service...

[automerger skipped] Fixed crash in telephony when underlying data service died am: c1e0a9d5 am: 28fec4fc am: 4227733b -s ours am: e1445696 -s ours

am skip reason: Change-Id I4499dc5c3748c0fada6a9e58046b2f6d52c01bd2 with SHA-1 195b0905 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4c832aa3822cd5e6b62b41a5bf3d84cd802a354