[automerger skipped] Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fce6 am: eeeb5b506f am: d397780a38 -s ours am: a23339f3b7 -s ours

am skip reason: Change-Id I626f871b64d50127feece80f018272e51ad1c66c with SHA-1 715073fc69 is in history

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

Change-Id: I8078fc3d3c88fbfd18454662cc47542f6bbc7209