Merge "Relocate VpnManagerServiceTest and VpnTest to the frameworks" into main am: e7d727b275

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

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