tree dde54a5aa3b4bf634c39f70072f9c1d8d4eed982
parent f9ebe077ff6ef5685bf022876f89b998de33343f
parent aa2b03ecea1df9db1b644d5ee467a55cd7c11496
author Nataniel Borges <natanieljr@google.com> 1613754152 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613754152 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d80ea1c572a3eec58a67b0d7c4faa79b30c206a