Merge "Fix NetworkScoreTest flake" am: f69ae23e01 am: 4b27a93eb2

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

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