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

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

Change-Id: I3dcf924822f94916c117b69f3fa2bc6ff9487115