Merge "Delete VPN methods in ConnectivityManager." am: e66719e8ed am: bd53da5929 am: 9d99263e49

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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