Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fce6 am: eeeb5b506f

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

Change-Id: I342f10760b799b934c5b33b1a0afb81816a312d2