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

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

Change-Id: I9946e5fa01da0c702a76b8cc47266fc39121fa75