Merge "@RestoreDefaultNetwork DnsTest" into main am: f62247c13a am: 8117b7fcc4

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

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