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

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

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