Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" am: bfdd0f3c3c am: 11124c2106

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

Change-Id: Ib1cb5a9a6b476f05af2e730533413cf308fc5efc