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

[automerger skipped] Merge "Refactored DataProfile and ApnSetting" am: bcafa9a7 am: 0ffc04a5 am: 026856ae am: 1ed77b62 am: 80be35b6 -s ours

am skip reason: Merged-In I1f2ad8239461469bacb8fb67e2e61c9a8a47795b with SHA-1 bbb11109 is already in history

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

Change-Id: I37a042794d2e9239a5df902daaec3053242e6bd9