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

[automerger skipped] Merge "Data connection for carrier specific APN" am: 47a1e949 am: ba9b9916 am: eb10ff67 -s ours am: 3ede3f30 -s ours

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

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

Change-Id: I82f9425108e0066afd466fc432a734b51047f03f