Merge "Data connection for carrier specific APN" into rvc-d1-dev-plus-aosp am: e2b212e94e am: e662938fdf

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

Change-Id: I83ecb4caea6b66b8c3e08beda3fb70598132707e