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

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

Change-Id: I247a28865409eb2e5cdf15f3ce911a34833f4d66