Merge "Attempt to fix NetworkTracePollerTest flake" am: 5e5542939c am: 0d760e2283

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

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