Merge "bpf: allow tagging non-tcp/udp sockets on T+ & 5.10+" into main