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

[automerger skipped] Merge "Add new fields to ApnSetting/DataProfileInfo" am: 10076dd4 am: 71632428 am: f59385f2 am: d8e9cd5c -s ours

am skip reason: Merged-In Iac7dbeeb0fcb80dc0d67e71ebf855f58635e63cd with SHA-1 2fdc0bbe is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1918478

Change-Id: I1b02928414bb642ac30be59b8a3577d8d48ddbaf