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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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