[automerger skipped] Merge "Data connection for carrier specific APN" am:...

[automerger skipped] Merge "Data connection for carrier specific APN" am: a412838a am: f2bc5a5c am: 987c5bdd -s ours am: 19d48ce5 -s ours am: f1a755e1 -s ours

am skip reason: Change-Id I062e650f9a906f07356c51c3042fe2ffcc34ba61 with SHA-1 898034a2 is in history

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

Change-Id: Ief1d53aa242a8dea05acf057c0ed99f279440b0d