Merge "Remove hidden API usages backed by VcnTransportInfo" into main