Merge "[MS57.2] Prepare APIs for data migration utility" am: 015e5690af am: 9eab5596a7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951101

Change-Id: Id30f351512d339e0704a9c8fe0406fcbb2de2dc9