Merge "Redact location info from PhysicalChannelConfig"