Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 19261dd671 am: e14f718270

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice973f502bb389d1ff400bbcd206987d48ff07dd