Merge "Remove hidden VcnTransportInfo methods from VpnTest" into main am: ad54f58a7d am: 37da1d0a8d

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

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