Merge "Stop using VPNs in getActiveNetworkForUidInternal." am: d25da5eb90

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e0de3f3cd9762feecf5dda5a40bb50791f17654