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

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

Change-Id: Id0fd4e8e92f26aaee063580c7290bc7f2d2cb290