[automerger skipped] Remove use of network scores, and provider IDs in VcnNetworkProvider am: 39659bf29a am: 1dd137dad5 am: 0ddc8c051f -s ours

am skip reason: skip tag Change-Id I0cabce702cfd8457fd1a152af07a847b87d67028 with SHA-1 fff0f8ba33 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674348

Change-Id: Ib1203f1cbbc3ab84460b8e0ed9c3839e214e989e