Merge "Delete VPN methods in ConnectivityManager." am: e8817c1796 am: 7e292e7920 am: adf1883cee

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadf429549b60f96c471a29fb91f12ff340c94cb0