[automerger skipped] Fix minor bug and deflaky for DnsResolverTest am: b896220cda -s ours

am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history

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

Change-Id: If4514b7c723b5ef0daf53d2a1d35698692840d49
tree: df59350490570719e8e80c417045e814b53c746a
  1. tests/
  2. Tethering/