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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I247b42083f5fe9d4f5e3a13a3b3c61ab2bcf5bcc