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

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

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