Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 7096deadf4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3572428c0044d410055a53f4bff680c2dd474028