Merge changes from topic "DNS_test_w_bpf" into main am: a65c72b6 am: 7e4a258f am: a30a7b1a

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



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