Merge changes Ia5bc896c,I0c9406f4,I3108ee94

* changes:
  Make VcnTransportInfoTest pass on AOSP.
  Immediately redact VcnTransportInfo.
  Do not automatically redact TransportInfo objects.