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

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

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