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

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

Change-Id: Ia7f2be585911611b3d0a807369a5ad1c3fe072a9