Merge "netd bpf: make tracing non-optional on user builds" into main am: 2351b1de89 am: 698669ffbb

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

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