[automerger skipped] Fixed crash when retry data setup am: f72d4913 am:...

[automerger skipped] Fixed crash when retry data setup am: f72d4913 am: 330cbf8b am: b5812995 -s ours am: c4673eb5 -s ours

am skip reason: Merged-In I3f0f3033c0b32df96a9620040e04a1c034f8c42b with SHA-1 79486c77 is already in history

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

Change-Id: I46d752fefc4e30e369fe4a9922d08d6003d4adaa