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

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

Change-Id: Ib90018a3f17b05eadcf9a6fd374199aff2446f87