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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b2968f3b0c6ed9d693f56c4f4697f410c706085
tree: c0e3a729f9297e0f45c598fc78cdaa8d6443a21a
  1. framework/
  2. service/
  3. OWNERS