Merge "Use the NetworkScore API in VPN" am: f88102ce0e am: 4b7c64df40 am: 7c204b87f1

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

Change-Id: I44f1357c44b195ba6a9394b919a215e32677e9c5