Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 10de86f5e5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9256f3912623619be712b82810f4086c6773bba
tree: 84c23d8d2d85086b3648ebaec693aa60b736425b
  1. framework/
  2. service/
  3. OWNERS