Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" am: bfdd0f3c3c am: 9d39295472 am: 63b0335dae am: 1f00085fa3

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

Change-Id: Ib2f1d8d6661c9f3e89e4dc14b382adf69587ceef