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

[automerger skipped] Merge "Data connection for carrier specific APN" into rvc-qpr-dev am: 2bf86a01 -s ours am: e2c23767 -s ours

am skip reason: Change-Id If1e6d2bf58de39c22caa901fcd90fb11f104d900 with SHA-1 115e0281 is in history

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

Change-Id: Idcc94d728ac3b0e7e1e4bdfa9a64a8502453aacc