[automerger skipped] Keep the version of dnsresolver consistent with that on mainline-prod. am: 9e319503 am: 50719694 -s ours

am skip reason: Change-Id I62508d699ccddc682aa3943c7ff87005661efb11 with SHA-1 f48eeaf0 is in history

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

Change-Id: Iab7288b00392c4966a2728d6ec7a530aa2362cc1