Merge "[MS57.2] Prepare APIs for data migration utility" am: 015e5690af am: 3963627a33 am: db072734e0 am: 06b4f8dce7

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

Change-Id: Id1438e84b678c6335dc41f3cfddfd7a2cbbb20b9