[automerger skipped] Remove use of network scores, and provider IDs in...

[automerger skipped] Remove use of network scores, and provider IDs in VcnNetworkProvider am: 39659bf2 am: 1dd137da am: 0ddc8c05 -s ours am: 6881d955 -s ours

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

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

Change-Id: Ib7f986ecd97a0fbcadee30e9642d0ba9ff3764a3