Revert "Fix testDataMigrationUtils fail on R device" am: 4bbe2b0825

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

Change-Id: I86b56dccae41b655c9c055b94e350c67847a59da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>