Merge "Add new fields to ApnSetting/DataProfileInfo" am: a28f3d2066

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

Change-Id: I3ec8c1c73701e94c826ec25111f0a5a1d0f36b1d