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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3572428c0044d410055a53f4bff680c2dd474028
tree: 498a5ab7359492ff13d4faa89f8b73d3c53a2b79
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS