[automerger skipped] Merge "[iwlan] clean up data connections on service...

[automerger skipped] Merge "[iwlan] clean up data connections on service restart" am: d88dcc54 am: dd05fa34 am: 7547332c am: 70b71424 am: 9bd251e2 -s ours

am skip reason: Change-Id Ifd95ff4d11a61b8a8e199c916bf57eeb04144868 with SHA-1 c6f23837 is in history

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

Change-Id: I9f5877be06bdad514f3a7ddfc146a630546ee648