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

Merge changes from topic "presubmit-am-21424deac7d34b28b63ade6b31762c69" into udc-dev am: a305f729 am: 7a3f8a8e am: b493cbb0 am: 3da144ea

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



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