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

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

Change-Id: Ic8624e7ad1c866c7342640c2765a1af64c071b7e