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

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

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