[automerger skipped] Merge "Stop using ConnectivityManager for VPNs in DPMS."...

[automerger skipped] Merge "Stop using ConnectivityManager for VPNs in DPMS." am: 6ec31401 am: d083daab am: 767bfd30 -s ours am: 9cc9faae -s ours

am skip reason: Change-Id I46d9a7768546139690154b1ee1e1bf716b3a2c17 with SHA-1 91fc38b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94f687f27e24dfd5662bb65a19d32713728c7cd9