Merge "Delete VPN methods in ConnectivityManager." am: e66719e8ed

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b2968f3b0c6ed9d693f56c4f4697f410c706085
tree: 30711bc0d3caba9c2fd453b7bc0dfab8de662071
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS