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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I247b42083f5fe9d4f5e3a13a3b3c61ab2bcf5bcc
tree: 30711bc0d3caba9c2fd453b7bc0dfab8de662071
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS