[automerger skipped] Data connection for carrier specific APN am: db7d612c -s ours am: 1c5275bf -s ours

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

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

Change-Id: Ie5ab16d62557ebb1bea2bb52836b73cf2d7a1535