Merge "Cleanup VpnTest for unused methods/annotations" am: 3fabc1b0e0

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

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