[automerger skipped] Keep the version of dnsresolver consistent with that on...

[automerger skipped] Keep the version of dnsresolver consistent with that on mainline-prod. am: 9e319503 am: 50719694 am: ab135cae -s ours am: 5f51f72f -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: Idea7d29520c6d31ff04d1b9775a2b55fb9ffb72d