Merge "Remove unused Vpn Dependency methods" into main am: aa9f61fc8e am: fd89545c67 am: 6658a16ba1

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

Change-Id: I386dd398ca4fcb2b8bf351cdff9971b4a404e623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>