Merge "netd bpf: make tracing non-optional on user builds" into main