Merge cherrypicks of ['googleplex-android-review.googlesource.com/24372273']...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24372273'] into udc-release. am: ed6d9cf8

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



Change-Id: I259b7d0324fd4f5dac23b191957ea9d19ddf0e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>