tree 4a4e6db4c29cb649a6152234c355fcce769e4495
parent 7e292e792063adcb92346d0de6ec001530620bad
parent 7096deadf4a32768717e74b11eb8e6289a65976f
author Nataniel Borges <natanieljr@google.com> 1613751123 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613751123 +0000

Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 7096deadf4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3572428c0044d410055a53f4bff680c2dd474028