Merge "Remove debug only restrictions to network tracing" into main am: 06c8691fe0 am: abb723ab5e

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

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