[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: f6c96baf am: 0d0a69ee am: 42cc37f2 -s ours am: d93caa4e -s ours

am skip reason: Change-Id I9c18b88ccd9177fabc9f432c65fe777aa122fbd4 with SHA-1 aafb18b1 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1371118

Change-Id: I5d71f49dda74fda2ab7374815d728958f62aa1f3