Merge "Fixed that data connections not tearing down when APN set id changes" into rvc-d1-dev am: 89749a90da

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12102524

Change-Id: I89074c2299610d27aa1bcb6ee458f9fa9e24b89e