[automerger skipped] Merge "Add new fields to ApnSetting/DataProfileInfo" am:...

[automerger skipped] Merge "Add new fields to ApnSetting/DataProfileInfo" am: a28f3d20 am: 1de30d0e am: a67c0d0b am: 87f76c13 -s ours

am skip reason: Merged-In Ia007f22a5c976fa139e61d981779a65b5e3ffd3e with SHA-1 5b1d1665 is already in history

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

Change-Id: If4e587bfe86fb8cb0d8d680b87dc7fecab5d8bc7