Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 9203e5b94a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9256f3912623619be712b82810f4086c6773bba