Merge changes from topic "DNS_test_w_bpf" into main am: a65c72b6

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



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