Merge "Add FrameworksVpnTests" into main am: 344143b49c am: 4da7a57067

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

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