[automerger skipped] Merge "Fixed that data connections not tearing down when...

[automerger skipped] Merge "Fixed that data connections not tearing down when APN set id changes" am: 2c3e56fc am: eeeb5b50 am: d397780a -s ours am: a23339f3 -s ours am: d1fdda86 -s ours

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

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

Change-Id: I71a835976b590275fa331784947ecc30bc011440