Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 25e1524c60 am: e14979682a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id640d18f07531b74582bef6725453c8de8176fe7
tree: c5a66bcbfe0f0c495f763f7aa5fbe24b7812f356
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS