Merge changes Ia5bc896c,I0c9406f4,I3108ee94

* changes:
  Make VcnTransportInfoTest pass on AOSP.
  Immediately redact VcnTransportInfo.
  Do not automatically redact TransportInfo objects.
tree: ca3b4adb2cd13ad146fba30cadcbc04b92349bd1
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING