[automerger skipped] Merge "Refactored DataProfile and ApnSetting" am:...

[automerger skipped] Merge "Refactored DataProfile and ApnSetting" am: eaa057ff am: 1836ae25 am: bf8e802c am: 73d1c48d am: 4e5e529f -s ours

am skip reason: Merged-In I36e9eb1da9746df9e83c9f473832242824af7f31 with SHA-1 e7c764a2 is already in history

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

Change-Id: I7604d290a6a347c8dbe3dbb8b4f700aa16c64a99