Merge changes from topic "presubmit-am-21424deac7d34b28b63ade6b31762c69" into...

Merge changes from topic "presubmit-am-21424deac7d34b28b63ade6b31762c69" into udc-dev am: a305f729

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



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