Merge "Remove hidden VcnTransportInfo methods from VpnTest" into main