Merge "bpf netd: eliminate TRACE_ON/OFF" into main