Merge "Update FrameworksNetTestsLib dependencies on VPN" am: c6522a0307 am: e278d07bea

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2591306

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