Merge "Add @RedactionType annotations to VpnTransportInfo."