Merge "Fix NetworkScoreTest flake" am: f69ae23e01

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

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