Merge "Refactored DataProfile and ApnSetting" am: bcafa9a7b1 am: 0ffc04a539 am: 026856ae7a am: 1ed77b62f6

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

Change-Id: If99d64b771166a30fd4dadbec9e73af01f0e1920