Merge "Fix typo in ConnectivityDiagnosticsManager constant."