Merge "Delete VPN methods in ConnectivityManager." am: e846d48968 am: 3f6ac55db0 am: adf1883cee

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadf429549b60f96c471a29fb91f12ff340c94cb0
tree: 40e21b1dcc348fb42ada661caa03ce7d5f9b27bc
  1. framework/
  2. service/
  3. OWNERS