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

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

Change-Id: I57ec8a1b99f07d31f739470527fd2b88ff368431