Merge changes from topic "dnsresolver-interface-aware" into main am: 3ac57a61

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



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