Merge "Add FrameworksVpnTests" into main am: 344143b49c

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

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