Merge "@RestoreDefaultNetwork in ConnectivityManagerTest" into main am: 97963d4f65

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

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