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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib00a87fe258f34f17d115fffa1e00217f0f4bed0