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

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

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