Merge changes from topic "DNS_test_w_bpf" into main am: a65c72b6 am: 23cf9882 am: 02a86ac0

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



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