tree 84c23d8d2d85086b3648ebaec693aa60b736425b
parent 28e9fc26a8c6111b9ceaa4f38c4c1169dfb311ab
parent 10de86f5e5ba4e245035c2af4e451f2b4eace147
author Treehugger Robot <treehugger-gerrit@google.com> 1614119055 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614119055 +0000

Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 10de86f5e5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9256f3912623619be712b82810f4086c6773bba