tree 145932dd4790c45807797f15fd0104c8d2c48ecc
parent 8b9dd5728045c8c1375f14dfb47a2c7e62c03511
parent 7e292e792063adcb92346d0de6ec001530620bad
author Lorenzo Colitti <lorenzo@google.com> 1613752759 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613752759 +0000

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