Merge "[NETD-BPF#3] Relocate Tethering/bpf_progs and rename bpf_tethering_headers" am: 5fabfd8dd0 am: 266a861e58

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

Change-Id: I3a128232ae76b6074ab1cec084742e15f1a11aa4