Merge "Stop using ConnectivityManager for VPNs in DPMS." am: 6ec31401b4 am: d083daabf1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59da3b91cce7c5d21220b13a0924526ec7439dac