[automerger skipped] Fix minor bug and deflaky for DnsResolverTest am: 39ff53ead2 -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/+/13034728
Change-Id: I00655834f50d39a7ae08f6a275ff3c6cc1bc13be
This commit is contained in: