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

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

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