Merge "netd bpf - no-op code hygiene fix for DROP_UNLESS_DNS"