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

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

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