Merge "Don't use NetworkScore in TestableNetworkAgent" into main am: b19b6d74b7

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

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