[automerger skipped] Merge "Support wifi and ethernet connection for DnsResolverTest." into sc-v2-dev am: e3b6dc0f67 -s ours

am skip reason: Merged-In Ie1c7522426314ccc83008b75f90a57f3a53339d4 with SHA-1 fa8dbc5da7 is already in history

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

Change-Id: I42808c0629ded9431eb81fa962940275cf74d7c8